cellrenderer: Merge GtkCellSizeRequest into GtkCellRenderer
authorBenjamin Otte <otte@redhat.com>
Tue, 21 Sep 2010 14:52:59 +0000 (16:52 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 26 Sep 2010 13:11:45 +0000 (15:11 +0200)
commite66129015de47d21006ff03f82964a77fdf7ca3d
tree744cd6f0f36d8216ebeef9c7a52cd0550f695122
parentd9c92598612714683eab96fecf6e90a9531607e5
cellrenderer: Merge GtkCellSizeRequest into GtkCellRenderer

This mostly goes to keep consistency with the changes to GtkSizeRequest
in the last patch, as GtkCellSizeRequest requires GtkCellRenderer and
GtkCellRenderer implements GtkCellSizeRequest there's no use in keeping
them separate.

This patch renames the functions:
gtk_cell_size_request_get_request_mode()
  => gtk_cell_renderer_get_request_mode()
gtk_cell_size_request_get_width()
  => gtk_cell_renderer_get_preferred_width()
gtk_cell_size_request_get_height()
  => gtk_cell_renderer_get_preferred_height()
gtk_cell_size_request_get_size()
  => gtk_cell_renderer_get_preferred_size()
gtk_cell_size_request_get_width_for_height()
  => gtk_cell_renderer_get_preferred_width_for_height()
gtk_cell_size_request_get_height_for_width()
  => gtk_cell_renderer_get_preferred_height_for_width()
... and moves the corresponding vfuncs to GtkCellRenderer.

The patch also renames the implementations of these functions in cell
renderers to include the word "preferrred".
12 files changed:
gtk/Makefile.am
gtk/gtk.h
gtk/gtk.symbols
gtk/gtkcellrenderer.c
gtk/gtkcellrenderer.h
gtk/gtkcellrenderertext.c
gtk/gtkcellsizerequest.c [deleted file]
gtk/gtkcellsizerequest.h [deleted file]
gtk/gtkcellview.c
gtk/gtkiconview.c
gtk/gtktreeviewcolumn.c
modules/other/gail/gailtextcell.c